Make sure that we keep priv->columns >= 1 even for empty menus, since we

Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
	priv->columns >= 1 even for empty menus, since we divide by it
	somewhere else.  (#133428, Vincent Noel)

diff --git a/ChangeLog b/ChangeLog
index 19f9521b7502292189dce6dfb8c236b0a3dd294d..e40fde338e2a3a8284d2c2657cbbd49404152fb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
+       priv->columns >= 1 even for empty menus, since we divide by it
+       somewhere else.  (#133428, Vincent Noel)
+
 Tue Feb 17 23:02:58 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Fix for #119722, reported by Olexiy Avramchenko, patch by Owen

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 19f9521b7502292189dce6dfb8c236b0a3dd294d..e40fde338e2a3a8284d2c2657cbbd49404152fb0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
+       priv->columns >= 1 even for empty menus, since we divide by it
+       somewhere else.  (#133428, Vincent Noel)
+
 Tue Feb 17 23:02:58 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Fix for #119722, reported by Olexiy Avramchenko, patch by Owen

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 19f9521b7502292189dce6dfb8c236b0a3dd294d..e40fde338e2a3a8284d2c2657cbbd49404152fb0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
+       priv->columns >= 1 even for empty menus, since we divide by it
+       somewhere else.  (#133428, Vincent Noel)
+
 Tue Feb 17 23:02:58 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Fix for #119722, reported by Olexiy Avramchenko, patch by Owen

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 19f9521b7502292189dce6dfb8c236b0a3dd294d..e40fde338e2a3a8284d2c2657cbbd49404152fb0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
+       priv->columns >= 1 even for empty menus, since we divide by it
+       somewhere else.  (#133428, Vincent Noel)
+
 Tue Feb 17 23:02:58 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Fix for #119722, reported by Olexiy Avramchenko, patch by Owen

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 19f9521b7502292189dce6dfb8c236b0a3dd294d..e40fde338e2a3a8284d2c2657cbbd49404152fb0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep
+       priv->columns >= 1 even for empty menus, since we divide by it
+       somewhere else.  (#133428, Vincent Noel)
+
 Tue Feb 17 23:02:58 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        Fix for #119722, reported by Olexiy Avramchenko, patch by Owen

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 15ad9743f5f2f9dc7d51974b39b4ba6dd7663a82..acdd57a3c301b0d869451b63bd19175cc515b50d 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -948,9 +948,11 @@ gtk_menu_do_remove (GtkMenuShell *menu_shell,
   delta = ai->bottom_attach - ai->top_attach;
   single_column = priv->columns == 1;
 
-  /* recalculate these, assuming the child has already been removed */
+  /* Recalculate these, assuming the child has already been removed. 
+   * Note that an empty menu is assumed to have one column.
+   */
   priv->rows = 0;
-  priv->columns = 0;
+  priv->columns = 1;
 
   for (children = menu_shell->children; children; children = children->next)
     {
@@ -1015,7 +1017,7 @@ gtk_menu_do_insert (GtkMenuShell *menu_shell,
     {
       /* attach after the last row */
       gtk_menu_attach (GTK_MENU (menu_shell), child,
-                       0, priv->columns ? priv->columns : 1,
+                       0, priv->columns,
                        priv->rows, priv->rows + 1);
 
       return;
@@ -1039,7 +1041,7 @@ gtk_menu_do_insert (GtkMenuShell *menu_shell,
 
   /* attach the new item */
   gtk_menu_attach (GTK_MENU (menu_shell), child,
-                   0, priv->columns ? priv->columns : 1,
+                   0, priv->columns,
                    position, position + 1);
 }